NetworkMenu: show hardware disabled when rfkill is active

When wifi or wwan are blocked by hardware killswitch, we should not
allow changing the switch (it won't work anyway), and show
"hardware disabled" instead, similar to what we already do in the
bluetooth menu.

https://bugzilla.gnome.org/show_bug.cgi?id=665194

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index fa2b8dfab1fff328fb6eea753336210b33394787..e22cdd8397f9b49610873389ae0940460679aa17 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -249,9 +249,11 @@ const NMWirelessSectionTitleMenuItem = new Lang.Class({
     updateForDevice: function(device) {
         // we show the switch
         // - if there not just one device
-        // - if the switch is off
+        // - if the switch is off (but it can be turned on)
         // - if the device is activated or disconnected
-        if (device && this._softwareEnabled && this._hardwareEnabled) {
+        if (!this._hardwareEnabled) {
+            this.setStatus(_("hardware disabled"));
+        } else if (device && this._softwareEnabled) {
             let text = device.getStatusLabel();
             this.setStatus(text);
         } else